Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 25 Jun 2010 03:34:29 +0000 (03:34 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 25 Jun 2010 03:34:29 +0000 (03:34 +0000)

Trivial merge